Move gdk_window_lookup to common code

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 1c78ea2c7354916d0034a57ec2d9884bcc3a5f82..7c30e52c6cffb575052f203ec87805f7a5d375ee 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -10685,3 +10685,21 @@ gdk_window_register_dnd (GdkWindow *window)
 {
   GDK_WINDOW_IMPL_GET_CLASS (window->impl)->register_dnd (window);
 }
+
+/**
+ * gdk_window_lookup:
+ * @anid: a native window handle
+ *
+ * Looks up the #GdkWindow that wraps the given native window handle.
+ *
+ * For example in the X backend, a native window handle is an Xlib
+ * <type>XID</type>.
+ *
+ * Return value: (transfer none): the #GdkWindow wrapper for the native
+ *    window, or %NULL if there is none.
+ **/
+GdkWindow *
+gdk_window_lookup (GdkNativeWindow anid)
+{
+  return gdk_window_lookup_for_display (gdk_display_get_default (), anid);
+}

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index c912e26b4de9795b688f4ad5615440e0f48c40a1..f0094bab98fcd5e57cb5e2db1335cb09832a807f 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2868,13 +2868,6 @@ gdk_window_foreign_new_for_display (GdkDisplay      *display,
   return NULL;
 }
 
-GdkWindow*
-gdk_window_lookup (GdkNativeWindow anid)
-{
-  /* Foreign windows aren't supported in Mac OS X */
-  return NULL;
-}
-
 GdkWindow *
 gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
 {

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 549f7a38acc32c3454435a961e3a1dc8ae28f918..f2f27b5761a55002ac46652df3ac05b21a95ed73 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -685,12 +685,6 @@ gdk_window_foreign_new_for_display (GdkDisplay      *display,
   return window;
 }
 
-GdkWindow*
-gdk_window_lookup (GdkNativeWindow hwnd)
-{
-  return (GdkWindow*) gdk_win32_handle_table_lookup (hwnd); 
-}
-
 void
 _gdk_win32_window_destroy (GdkWindow *window,
                           gboolean   recursing,
@@ -3103,7 +3097,7 @@ gdk_window_lookup_for_display (GdkDisplay      *display,
 {
   g_return_val_if_fail (display == _gdk_display, NULL);
 
-  return gdk_window_lookup (anid);
+  return (GdkWindow*) gdk_win32_handle_table_lookup (hwnd);
 }
 
 void

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 3fdbd69d5998e41b8eaf0b60208a4fddc312f442..61d36edf9ec83c1efb885904bcdca4493bc99860 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -969,24 +969,6 @@ gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
   return (GdkWindow*) gdk_xid_table_lookup_for_display (display, anid);
 }
 
-/**
- * gdk_window_lookup:
- * @anid: a native window handle.
- *
- * Looks up the #GdkWindow that wraps the given native window handle. 
- *
- * For example in the X backend, a native window handle is an Xlib
- * <type>XID</type>.
- *
- * Return value: (transfer none): the #GdkWindow wrapper for the native
- *    window, or %NULL if there is none.
- **/
-GdkWindow *
-gdk_window_lookup (GdkNativeWindow anid)
-{
-  return (GdkWindow*) gdk_xid_table_lookup (anid);
-}
-
 static void
 gdk_toplevel_x11_free_contents (GdkDisplay *display,
                                GdkToplevelX11 *toplevel)